Fixing bugs in graph models and key decoding. Working graph tools downstream :)