Working Steady-State Model

Minor bugfixes