Updated comments, import and fixed chunk caching isues