corrected some definitions