port mapping, datavolumedir, small fixes