before merge last fix
Wrong file notification added on change avatar
Comments output fixed