various revisions
more changes