[PATCH 00/12] various bug fixes and enhancements