Last changes from suggestions.