Extra faces hidden, fixes critical bugs