Fixed insertions at r=1. Added calculations for POMF.