Bugfixes, completing Average Calculations