did up to ex32 and corrected some errors