More typographic fixes
A few little fixes here and there
Add markup changes and little fixes