Added fixes for dot drawing and towards/distance arguments