Working on notifications :)
fixed some of the conduits. Still some small stuff remaining though
fixed the infinite loop :)
cleaned up a bit