Various fixes. Some major typography changes