Fixed bugs, added bugs, yay