Fixed configuration docs, refactoring

Just a few ideas...