Some debugging things added