New names, more docs
Fixed a bug in part combiner