normal_mix.go: various changes and fixes