Fix stupid naming
Few more minor fixes
Chunk parsing