Adding the drawing listener.
Small fixes.
Attempt: merge draw listener into general listener