Fixes: handle FPWDs, and fixes NOTEs #655

Closed plehegar closed 2 months ago