few bug fixes
merge