Sunday night tweaks
cruft and important stuff from last year