logging changes
scrubber fixes, helper method renaming
various bug fixes