make subsystem improvements