some improve and configs