Shop, changes + fixes