patch and a few comments