oops, one or two more little changes...