fsm/wpi fixes & small enhancements