bugfixes and varitools