More improvements for captainmode