JAL-629 removed debug prints. added .cif. added some comments/code-markers