Revised a few things