fixed mistakes
merged