fixes for wave drag behavior and offset of x,y positions for more
natural drag behavior