Made 16-way getAllFunnels more consistent

Fixed .cpp code and added names to columns to make identification
easier.