Add doubletap2wake + minor cleanup