Start of commenting and fix to modifyTour
Update
Merge update