Any changes since the last commit are mainly cosmetic, but I am about to implement Mary's suggestions and that should be a major change.