Made most of the changes listed in email