Fix minor issues, correct references and spelling/grammar