Merge pull request #12 from mbarden/master

Please fill out this field.
tweak ADP convergence tests
testing
Rework everything to make it make more sense and look better and potentially easier to debug