Updates to notifications and standardizing error codes...