some fixes at the movement