some more setup tool fiddling (#44)