Bug fixes & notification adjustments