Make /map better