minor fixes, first additions to v2.4.2