small fixed and TODO