last minor updates for local service branch