grammar rewrites, maintainer code correction