Further output rotation scenarios

Also fixes rotator limit bug. `>=` should have been `>`.