added hopscotch tour + minor fixes