a few minor adjustment