#315 minor improvements for setting revenue model