updated to account for stray &amp; where &s should be
increased analytics closes #215