bugfixes for ffw addition