small fixes
wip