Various updates and enhancements