added question numbers
minor cleanup