added icons and more comments