review changes

Minor changes that should be made before merging into the master repository.