Cleaned some things up that were broken.