todo + small fixes