1. add measurement for heavy users & 2G/3G;
2. some minor refactoring;