Cursor and other improvements