Fixed and added a few things.