Added todos, fixed udata bug.