Fixed density-metric, and a couple of little bugs.