Better sample click handling - but not yet there