Finishing project. Fixed some bugs and resolved various issues