Several changes after review