Cursor fix, boundaries and so forth, pre-final version.