Update scrub, added comments to utils