Minor updates;
Updated notification with block to remove observer;