fix concerns 1-3 in dion's feedback