some bugfixes and custom tooltip
merged