Fixed settings and imports

added notifications