Found some bugs, fixed a half