Adds notifications, credits, and various fixes.
Fixes merge conflicts