bug fixes and double click