nearly polished off the masking section!  lots of bib changes for increased consistency