Lots of rewording and textual improvements