More modifications of the entire paper