fixes #5; cannot add duplicate maps; improvements to service handling