enhanced config / startup
cleanup; flow handling