Modifications to location and map chapter