address yoric's review comments, pass 1