- Fixed more bugs and cleaned some code.