aaaa -> yyyy fixes + corrections