assorted coverage improvements