Small fixes
New debug feuteres