Feature doubleclick shortcuts advanced

now re-factored the code so that two methods exist instead of one. Some comments are added.