bug fixes
merge