Fixed base hours
Fix major issue in demand response
Add retirement and investment output