various bugs. Allow to alter graph afterwards