a few 1st changes