Revisions to Health & Safety
Closes #9