[FIX] fai fixes
[FIX] typos