some todo resolved, also todo added