Added Popper ref; fixed refs; clean up