Fixed some bugs, added others xD