cleansed persistence module a bit. PLUS: dist needs to be in the downloadable sources as well