More fixes & More Debugging Messages