redumped and corrected typos