pushing changes from afternoon, numerous corrections, more to follow