few fixes with todos