Several fixes and customization enhancements.