All tests passing

Fixing stuff and junk