Updated doc and some small adaptations in flexible notifications