commit 15

additional minor changes.