Shop working; fixed some bugs etc