Adding some little changes and some little improvements