Susburrows/refactor reductions seasonal lev rebased bugfixes

Added some more bug fixes and refactoring.