couple of clean ups, re-enabled FPO level completion