Fixing and comments