I relaxed some of the restrictions that were too
onerous to fix, but then fixed all the other issues
that were reported.