added tooltips
merged with master