Fixed some name issues.
Added a test config and new questions.
Just some rearanging of the source.