bug fixes and tooltip redesign