fixed contexts + chunks left over after comments