[master] bits and pieces
mend