Integrating shop package, fixing stuff...