shop routes done and some minor fixes