Messed up some things and fixed them