Some tweaks in the movements

No more functions and more samples for candidate position.