Added some comments, changed vx, vy into v,w