fixed bugs
merged + fixed bugs