update the content and cosmetic changes