FinalCommit

Final Commit fixed last bugs and what not.