Minor fixes in the comments and the notifications