improvements and comments