bug fixes from user feedback