Implement better random notifications and fix an edge case