merging in chroma/logfsgram bugfixes