Minor simplification and improvements
Bug fix in steady state solver