minor work with init_all
minor changes