Change comments and README to match latest changes