cleanup
refactored
cleanup
integrated some data sinks into config / startup
enhanced startup / configuration