fixed a couple of errors from last commit