2.0

Work on some enhancements done as part of deployed projects.