bug fixes + notifications