Fix old content and improve structure, and remove
repetition. Also brings back content deleted by accident