bug fixes
merged conflicts