Added Shops and fixed bugs