Some comments from dolske + gavin; Rebased post b2g v1.0.1