Fixed bug
some little changes