Added notifications. Fixed comments