several changes to make a better default buildout