some general fixes for Friday's demo