Some improvements to rmds, but not re-build yet.