Updates to cursor and a few fixes.