Basic db ref expansion and cleaning up comments