Take into account almost all of kathyuff's review

@kathyhuff thanks for the comments, it helped a lot improving the paper!