added tours 17-23
added tags
refactored tour23