S99: added more entries, fixed typos, added some