notifications + small fixes