various
more various small fixes