Added stuff on deadlocks