Totally fixed everything.....I hope

I think I finally fixed everything. Merge and see what happens?