rt cleanup and user updates for header and comments