Update TODO; remove finished features