Disabling edge value check since a bug causes it to fail.
Improving, some bug fixes