Fixing more of my bad code.