Logging question data, and minor cleanup