add annotations, fix small var rename issue in Converter