Added draw boundary, and trash/rebuild strokes