Cleanup
Some more working on Shops; Bugfixes