Fixed Bugs & Added Comments

Almost finished the project