fix all the more thangs