Fixed a couple errors from the last PR.
Cleaned up commented out code.