Missed a parenthesis, also. And fixed some warnings.