lots of changes - catching up with many improvements over the last few
months, including stuff for MGHA.