Additions and fixes.