Interim checkin to fix various problems so domme can help