Added TODO, and also tries to fix canvas width problem