Draw line and other small changes