fixed bugs
merged changes