addressed some more of yoric's comments, pass 2