ELLINT bug, ROTCUR table names, new templates