Various additions and fixes.
57 files changed