demo improvements and comments