Bug fixes

Need to fix the bugs