Late changes and comments