Fixed all the stuff