Fixup corrections and more examples