Made some more changes along those lines.