Fixed end of day bugs, should run indefinitely
tweak