Redid a few things.