Improvment and Bugfix on Canvas