Minor updates and a location change