few tidyups - double click issue still to be understood - issue #135