Fixed Stuff

Fixed bugs