fix MC gen averaging, plus some cosmetics & cleanup