add map; server fix; ws address fix