Changed and added a few things.