Fixes issue #144; reorg variables file; add contextual badges