notification fixes and gig validation