Adding Fran's changes to cursor movement/scrolling and persistence data