added FinalStateFiller class and modifed some variable names