enh: added improvements pointed out in the reviews