Tooltips added

Please merge.