add service handling
fixub for ghost nodes is not needed anymore
announce server as gateway
minor style fix