speed up drawing considerably

by remving one step where a third canvas was used
cleanup
Merge branch 'develop' of github.com:snorpey/contrast-distort into changes
Merge branch 'changes' into develop