Modified and updated a few things.