Better Position Control and Bug Fixes

Travelling Merchants also complete