bug fixes
merging