Improvements and comments