Working cursor aiming. Still has bugs.

Commit done in order to merge with MB's latest code.
Resolving merge conflicts.