fixed some stupide mesups while i was at it.