New maps stuff, other tweaks.