Fixed some bugs, got some jank done with.