fixed bugs
merged