bug fixes & minor updates