Many changes to the entire paper