small refactoring
reverted a previous error, added qtip tips