Finish config files and fix property files