small fixes
TODO