minor updates

small fixes & tests
same