Removing TODO and improving API docs