Fixes to Graph implementation. Session wrapping in Factory made a little
more bullet proof

Signed-off-by: Nathan T Freeman <nathan.freeman@redpilldevelopment.com>