Add more measurements
Refactor adding finals
Refactor move AbstractNDFANode to package compiler, instead of having  it in a package of its own