end of day: improved many things, still having issues with canceling with a future