cleaned up canvas initialization and refreshment
Merge branch 'develop'