bug fixes & functionality improvements