updated paths, fixed a few gaps, using native notifications