missed a couple bugs