Fixes issue #41: Tooltips and other minor edits