Minor edits, feedback from @jcarlosgarcia