some minor bugfixes buildout
initial buildout strucutre is working