Updated Cursors and bug fixes