some cosmetic changes + text