Slight modifications and comments