Added AverageValuesManipulator + Minor things