doc and assertion tweaks