Hardening parameter order, fixes #224
Merge pull request #225 from avoidwork/edge

Minor fixes