Syncing, var. fixes.
Started on bm import from Moz json.