Cursor Position bug fix and performance boost.