code cleanup, removing warnings.
try to fix notification issues, to open entities on notification