minor changes

Added some of the changes made in v4, that were not considered during the revision
to v5