some fixes. preparing for 4.2.0 release