Improved handling of roads. Better drawing.