merged Src
merged Arch
some corrections
correction
FTI integration