First pass over 2nd batch of corrections from T.Sklavenitis.