Lots of tweaks, based on the last discussions.