fixed a bunch more bugs