Fixes #38.  Also addresses weird right-click behavior.
Not really important.