some minor fixes, still not done with chunking