fix a lot of other stupid things