Some last comments and changes