4.0.1 maint release, variety of small fixes