Completed def of 2.1 and 2.4 as well, and identified typo in hyperparam script leading to incorrect results in 2.2 and 2.3