small fixes + notification