Cleanup, fix several question bugs