minor clean-up
add ambassadors handler