Incorporated Pedro's suggestions

And, on my way, a few by Antonio