clicking on dataset updates to first companion
minor fixes
Merge pull request #210 from jpecht/master

dataset click / minor fixes