fade cursor stuff
lock location vector
few changes
lock stuff
minor changes
minor
Merge remote-tracking branch 'origin/master' into Test_John