Code Cleanup
Fixed another function. Changed some debug code. Cleaned some stuff up.
Fixed one MORE muck up from the merge. Should be totally good now.