simple movement mapping and minor corrections