merge some leftovers

this got left out