make BEM modifier lead on from double underscore convention
fix typos