part of canvas and somme fixes