fixed maps a bit more