fixed many chunking issues