Various changes as suggested by reviewers; formatting issues