made revisions based on notes in redmine.