Small changes and comments
small changes and comments