- more fixes to cursor handling