commented out cursor_position code and some cleanup