Got rid of a debug message
Added many a comment