Fix and add annotations