TODOs and minor date editor changes
TODOs and minor date editor changes