Cleanup:
- Fault handling was hard coded for four strands
- Update out-of-date comments