Fixed some bugs, working now