Big typography improvements, plus ots of updates and cleanup