Small changes and comments with ideas