some small fixes
prepare for DI