minor cleanup of graph
First pass at speeding up emulators