Bugfixes and tooltips