Week 17 update

Year-end enhancements and fixes