Fixed Chunk comparator
Misc cleanup