More work on Scraps

A few more odds and ends have been buttoned up: