Fix function name.
Add baseline corrections and fix minor issues.