todo improvements