Fixed diagram and minor things