bug fixes
Merging