Added comments
Added improved notifications