dirty fix for unpickeling model from outside of the package context, plus minor changes in the setup to include more stuff