Wake Gestures: various improvements and fixes