Fixed several issues with scrubber

Fixes #96, #95, #104, #105, #106.