SpaceMan improvements before test