Improvements after comments by Andrzej