Assorted Changes

and so the crazy refactoring process sees the sunlight after some months in the dark!
Merge pull request #4 from charldunois/patch-3

Assorted Changes