some cleaning up
testing
bugfixing
Merge branch 'objgraph' into unstable
Merge branch 'master' into objgraph
fixed lines not drawing
Merge branch 'objgraph' into unstable