Minor tweaks to location and progress