Update comments + trace