bug fixes
merged