some more init cleanup, and comments