Cleaned up and redid a few things.