minor changes to init structure, blind commit

Note: needs testing. Blind commit.