Many updates to support handout kits