Added much things to the shop + fixed stuff