Started work on the annoying Cursor-bug.