improve Wolff

there is some open todos and question around our Wolff implementation