Resolved some fixmes and updated regression test scripts and results - because some variables have been renamed