Minor update including code cleanup and semantic changes

First release with 14 questions ready

This is a pre-release version with 8 questions. Core functionality is present.