A few more enhancements and recommendations from Alex Pilon.