Working unmodified set
Minor updates
All errors fixed