added touch-ups for demo tomorrow