ENH: Several adds on after manuscript submission