Fixed crash with researcher.
Fixed shift click crashes. : D
Some other minor changes.
Merge pull request #74 from smigolpol/master

Shift click fixes.