Major updates to update-maps.sh, fix most issues with it