Enhancements and bugs fixed for the new RS