FA diferents things Added and fixed