fixes
fixes
Adjusted position updates
Some cleanup