fixed lane swap bug and added punch motion