a few changes, additions and fixes.