add week 16 and fix email scrubber