Fixed some bugs, changed some minor stuff