Fixes Wages statistic
Updated statistic to new wages concept, see #30. Also updated some methods to be DRY.