Several changes based the 1st site review document