added missing bits and corrected others