various minor revision