added comments, notifications, errors, much more :)