more changes
Final Submission

Still things that I need to fix, but this is the best I could do for
now :)