pushing up all of the fixes