Added notes, targets and tweaked click to manage touches