added comment functionality
minor corrections