General cleanup
Add question numbers during HTML compilation