More graph cleanup/fixes
Edits to evaluation