more lines, working scale in both dimensions
some renaming, rearrangement
draw function separated
Merge branch '1' into 'master'