fixed efficiency metrics, needs to be tested on tablet
Merge branch 'master' of https://github.com/alpearce/cis350