blubb
some improvements