fix null tags that were not null tags and some indenting
fix notifications and some PM issues