major bug fix in the shop module and other minor improv.