undid a couple of my changes.

i was wrong on certain things.