Cursor fixes

Closes #16.