some little improvemts