flags improvements