Removal of errors and some simplifications.