Bugs Fixed

Some bugs are now fixed