finished quick push for friday, no testing done
quick fixes and smoke tests