now supports notify flag and fixes another nil for each bug