Rename some variables for better clarification.
Add questions hash
Add suggestions from Shaan
Add everything Matt did
Git wants me to merge something?