still early morning fixes