Fixed it up some more.