fixed bugs and added tooltips