second commit, notifications, comments and some stuff else