Some fixes to item_names and waypoints.