#5 Double click issue and general improvements