Fixing 3 mess ups