minor refactorings
minor
output configuration