Important Tooltips added, and some other minor changes