gateway: more updates