debugBuild improvements
small fixes