Added most of Ben's changes in.
5 files changed