bug fixes, minor refactoring. 2 chunk file test now WORKS!