Feature review and TODO update