Get sketches to work.  Other small fixes.