Restructured drawing code

I added also the plus operator. Shurely there are some bugs left, but
generally it works.