adds debug to necessary places
2.0.6
Merge branch 'develop'