Updated column ordering
Removed debug code
Fixed paretn col names