Final Commit

Tuned and fixed what I wanted to finish