whirlpool fixes

forces handled by whirlpool object now