Logging question data, and minor cleanup

Wriggle >:I