fix parsing new style AN
fix missing spaces
fixed data
merge data
update registre