Bug fixes and new wrapper for prefs access.
18 files changed