Changes on text and minor tweaks