Bunch of clean up and small changes.
Tiny changes. Need to pull in from master.