Fix Debug, add more Debug messages