Filled in some more init details and rearranged a couple of things for integration.