Simplifications to some function calls, for moving around and for drawing lines. Removed some debug colouring.