pass on sec 2 done; mostly nits