Lots of tiny fixes to get the RTS working!