Cursor flash
Fixes for text editing
Merge