fix all the stuff