fix settings and add completion flags