Cursor update code (half works)

And a a few other things I added for no reason just because.