Solved p133
p133: added f1 (a slightly improved f0) and f2, a vastly improved one