user primary billing strategy, several tweaks