Remixes of "RTS fixes and changes"

Feedback