Sketch updates, minor fixes