small init-cleanups
init working