fix some mistakes and made the constant names more clear