fix ginml2an + merge with K2an
introduce CNA2an, adios CNA2ph