fixed a lot of bad shit