Reorganized text
Tweaks