Working on cursor but it only animates sometimes...
cursor fixes
merge