merging corrections into fork