Fix up Jay's hackathon comments, and other clarifications and modularities.