reordered vars, changed canvas size