wip
some improvements