bug fixes
weird problem with subsystem state setters