misc morning fixes
morning merge