Map: fixed a bunch of tiny problems