Fixed some issues

position.x instead of x_vel
Commented and cleaned code