fixed some of the dumber stuffs