LOPO-2: Port additional methods + improve incorectly ported methods