Some Debug code, and I fixed disc state changes