Fixes
Pack up all of my changes for mattwoodrow