Wake Gestures:  minor improvements and fixes