debug section and small updates
Merge commit '3204e06c45a7b0923d7fab2408df1e762d6d7566'