Adds missing symbol: f.
Adds lots of changes for brevity and adding more complete problems.