fixed stuff

I didn't run unit tests.