OS X cursor, fixes, prepare for new app