Typos + ameliorations