fixed a bunch more stuff