renamed node '@' to 'at-keyw' + a few more writer regressions