fixed some mistakes
merged