debug + small changes
Merge branch 'master' of https://github.com/Desom/NUI_Code.git