Updated rdm getinfo, minor re-org