introduced an odd moz bug. figure it out later.

also removed some garbage.
Merge branch 'master' into gh-pages