Added debug message
Changed visability of some things.