Final v1

All comments included.
One week before deadline.