shop + fixes