Fixed adding; add ordering by deadline