Fixed some validation issues.
Added notifications.