Add simple fault yand all the associated fixes for bugs it found
Merge branch 'feature-simple-faulty'