* some small adjust