some small fixes and logger improvements