Width/height setting & canvas's width/height now adjust correctly