AddMap and small changes