tooltip and bugfixes