fixed a bunch more things