Moves some config to createContainer, some fixes