fixes & upgrade Shop