small updates to subsystem