Misc text improvements and linking repair