More canvas + bug fixes