fix extract_settings & app_settings bugs and more...