bug fixes but sketchpad breaks tests