Removed cursors, fixed a selection bug, refactored.