fixes to v. 2.4, second iteration