Fixing several FA2 issues and default config
Merge conflicts
Merging conflicts two, the return