added a shopsystem and fixed some bugs