various init improvements