Some minor changes (debug messages, clarify code, ...)