Updated diagrams and corrected data from tables