some attempts to fix date muddles