Fix architecture selection
Add default config file