added todo
few improvements