fix graph
commit cache.txt and stuff
fixed merge issues