Added Shop Class and Fixed Various Bugs in other Classes