small changes and comments