updated to latest version of fa

various fixes