fix integration; add comments