Modified some little details