Final Project (Fixed some bugs)