Fine scrub improvements. Fixes #30