Minor changes

Minor corrections, changes, and new functions for 2.1.5b