we need some little changes and copy some things to fff-hood later

Signed-off-by: Christian Dresel <[email protected]>
Signed-off-by: Adrian Schmutzler <[email protected]>