implement assorted feedback from review