rearrange, minor updates