Comment cleanup
Enum Cleanup

moved additional enum and fixed failing test
Seperation of default & config fluent interfaces

moved "defaults" out into seperate interface and updated tests
accordingly.