Small improvements in handlers and canvas display.