bug fixes
conflicts merged