Tidy things up and fix graph files