General updates for revenue handling etc