some bugfixes
added tooltips and some bugfixes
fixed merge errors