fixes to work with latest core, and some seemingly left over RDS
changes.
left a print in!
Merge pull request #214 from unwin/develop-ROGER-RDS-TEST

fixes to work with latest core, and some seemingly left over RDS