Adding doc and correcting Tooltips