fixing child
removed debug
Merge branch 'blah' of https://github.com/creighton/xci into prod
merged tom's branch