Fixed some major bugs and working on more