added config
progress on improve
almost finished improved