added some fixes against problems with shops!