another round of small fixes