fix T&P fitter & macro for WP70