A little bit of changes and comments