Misc changes

Fixed some deprecation/language stuff, more tests, tweaked graph
interface again, fixed binding groups.