More rdoc and cleanup.