A few pre-nini changes & additions . . .