Re: [RESEND,PATCH 0/7] Improvements and fixes