Clean Up

random bugs are cleaned up hopefully we arent correcting the same thing
at the same time