added deadlines and some other missing stuff