scenario stuff
fix long running goals and solar