Adding in shop table fixes and shop queries

Yee Shop!