some little improvments