moved line and area drawing into separate fns