More Robust Data Integrity Checks

More robust data integrity checks and some local notification fixes