ECA constraints loosened where appropriate
Contact scrreen now renders.
Merge pull request #417 from einhverfr/master

More fixes for master