fix some stuff and add map links