Changed number of childs to 20.
Fixed conflicts and removed nasty comments.