Bugs/ff rendering

ping @samurai