Fix movement, somewhat.