move settings to config and improve