Updates to POC-1, combinator still wrong, sigh...