Many tiny fixes - ready to implement new subsystems