fixes per bev comments