making drawLine more streamlined, fixing lots of bugse