Made some changes we talked about.

@Nearhan