Fix/feedback

Look at each one of my commits, starting with the top one. 

Lets set up a time to talk through all of it.