Minor changes (again)

Factored out some annotation, removed ”rug” geoms, etc.