fixed bugs and changing shop stuff