ship the commits that have piled up - nice bunch of neat fixes