Scheduler and investment improvements