Minor additions and fixes.