Fix notification and Few minor changes