Fixed Stuff from Weird Commit

Fixed Stuff from Weird Commit