misc improvements

see commit comments for details
Yes, please.

It could be worth to ask for a clarification. /cc @munificent