Various chhiggs updates
Merge branch 'master' of github.com:pfs/2l2v_fwk