General update of layout, correction of typos, etc.