Bug Fixes

Changed the stuff I needed to. Details on the bugs file