S99: more entries, typos, reordering