Improve the comments and README (part II)