rich rebuilds

A collection of 3 issues