some more and init cleanup
9 files changed